64414277da
This reverts commitcf6c06ac74which is commitf9ac779f88upstream. It breaks the Android abi. If it is required in the future, it can come back in an abi-safe way. Bug: 161946584 Change-Id: Ia4d18c9acdd553b1806ca844c47e34a76f6c6b93 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>