This reverts commit cf6c06ac74 which is
commit f9ac779f881c2ec3d1cdcd7fa9d4f9442bf60e80 upstream.
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>