Updates for mr1.1

Change-Id: I8985aab7f32b18ce3e152908c35e7d00237ba114
Merge branch 'cm-10.1' of github.com:/CyanogenMod/android_device_lge_mako into cm-10.1