This reverts commit e85cf9a5a4 which is
commit 7c327d56597d8de1680cf24e956b704270d3d84a upstream.
It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.
Bug: 161946584
Change-Id: I765bfde25289da842ec71cdc67d8d234c9c6cc91
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>