Disable emulation and also some minor change
Merge branch 'cm-11.0' of https://github.com/dhiru1602/android_device_lge_u2-common into cm-11.0