This reverts commit 9ea26a8494 which is
commit 8ce8849dd1e78dadcee0ec9acbd259d239b7069f 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: I44be0f7b4df730e599bf80939b6d40d4f8d04a57
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>