Merge "hardware/libhardware: use proper nativehelper headers" am: dfaaefd5bf am: 70fe02e33d
am: 0254f831a0

Change-Id: I12cc3a83e8b97295180aa493b41699d4db3c98a5