Merge remote-tracking branch 'goog/master'
Merge branch 'master' of github.com:AospPlus/android_hardware_libhardware