Updates for CM12

Change-Id: Ib1045b39c5bc88d5081372e6803cfa784e6795d1
Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android_device_lge_g2-common into cm-12.0