10.2 bringup

Change-Id: I5ad32cbc137e369b18444afa089cfb4298d49415
Merge branch 'cyanogenmod' into cm-10.2