This reverts commit 7d8bba4da1 which is
commit 2fcd7bbae90a6d844da8660a9d27079281dfbba2 upstream.
It is part of a patch series that breaks the Android API. If this
series is needed in Android devices in the future, it can come back in
an ABI-safe manner.
Bug: 161946584
Change-Id: I6737a0ee4a39082058be5a63caee994af70a262e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>