c9606079a5
This reverts commit304802e5b0which is commitcfe6807d82upstream. It breaks the Android api, so revert it for now. If it needs to come back, it can do so in an abi-safe way. Bug: 161946584 Change-Id: I0f1f7b4de721ff23d252eef9b55678c3b6053cb7 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>