This reverts commit d2112b18b5.
It breaks the ABI right now, but will be brought back at the next ABI
break as it will be needed for Android systems.
Bug: 161946584
Change-Id: I26711f5fc537c34fe6e9af2fa6cbb64fd62cb681
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>