This reverts commit 95b30a4312 which is
commit d4cfb30fce03093ad944e0b44bd8f40bdad5330e upstream.
It breaks the Android abi. If it is required in the future, it can
come back in an abi-safe way.
Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4e6a55ac7f3471fe8d8394c71e771eeaa7960400