This reverts commit ec4162bb70 which is
commit 1671bcfd76fdc0b9e65153cf759153083755fe4c upstream.
It breaks the Android ABI, and is already merged in the non-LTS branch
in an abi-safe way.
Bug: 161946584
Change-Id: Ie689c535c1f7c1c4a1e6af6805f400da625104c7
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>