This reverts commit 1cb3032406 which is
commit a54895fa05 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: I4148feec0c39bb0a5644203da6f1374bf1769dbd