This reverts commit b796adfc98 which is
commit c1ed39ec116272935528ca9b348b8ee79b0791da upstream.
It changes the signature of a ABI-frozen function, while nice to have,
isn't actually needed right now, so revert it to preserve the Android
abi.
Bug: 161946584
Change-Id: I49f5124db00ac2aedd5d96c3aedde80c4ad11664
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>