Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of https://github.com/beegee-tokyo/nameless_android_hardware_libhardware into cm-11.0