fixes
Merge branch 'lollipop' of https://github.com/AndroidOpenSourceXperia/android_hardware_libhardware_legacy into lollipop