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

Change-Id: I211650c2d544f3b7161bdf8b67cd4465fc66be81