This reverts commit 840ce9cfc8 which is
commit efbbdaa22b upstream.
It breaks the Android kernel abi, and is not needed for any Android
devices at this time. If it is needed in the future, it can be brought
back in an abi-safe way.
Bug: 161946584
Change-Id: I6ff33f14fe22565b33e5c760f5bbfc94b17006b3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>