This reverts commit b76ea430e9 which is
commit 26c6c2f8a907c9e3a2f24990552a4d77235791e6 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: I7cebceb7c3e1eccf4a36a18dbe0e7ec21378b719