cb5f0587c6
This reverts commit356da2d5c0which is commit62ec209209upstream. It breaks the Android KABI and isn't needed for android systems at this point in time. If it is needed in the future, it can be brought back in an abi-safe way. Bug: 161946584 Change-Id: I2d96eecc78d7d7848d465c8759ebcf81b5276c0b Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>