f95f372cf9
This reverts commit04cc361f02which is commit44bdb313daupstream. It breaks the build as it relies on a previous patch that was reverted for Android ABI issues. It can be brought back in an abi-safe way in the future if needed. Change-Id: Iccdf587ba58542c014d04eabfa521bc5dcbb1641 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>