This reverts commit d2b65976bf which is
commit 2279f540ea7d05f22d2f0c4224319330228586bc upstream.
It breaks the Android ABI and is not needed in Android systems, so
revert it for now. If it is still needed, it can be added back later in
an ABI-stable way.
Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If069cb7d8460c5a00180a45085365747ffb8a8e7