This reverts commit db317a37229b2dd338c4b9348310ca47e462ca67 as it breaks the ABI and is not needed for Android devices at this point in time. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I060fe0a18cc6232f82fa4d3dd0426262a71aaccf