Merge "hardware/libhardware: use proper nativehelper headers"
am: dfaaefd5bf

Change-Id: Id4c967a27eb0a0d2846f76ddf718dfdd4b3d5660