Merge "hardware/libhardware: use proper nativehelper headers"