
This reverts commit 08f61a3491
which is
commit 9cacf81f8161111db25f98e78a7a0e32ae142b3f 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: I83c4a094c650eee44a2f7160aab6ccc6e442e726
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>