A lil cleanup
Don't use O3 atm
Merge branch 'jellybean' of https://github.com/XYAOSP/android_device_asus_grouper into jellybean