Some fixes
Merge https://github.com/XPerience-NXT/android_vendor_cm into HEAD