This reverts commit 079651c6cf which is
commit 70fb5ccf2ebb09a0c8ebba775041567812d45f86 upstream.
It breaks the Android GKI kernel abi, and is not needed for Android
devices, so revert it for now. If it is needed for this branch, it can
come back later in an ABI-stable way.
Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie4a8739747859bfd57e48a2745b7fcf90233fd6c