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

Change-Id: I9daf9d8eb03614b93e54ec13150ff471a5c46eb0