aokp_m7

Change-Id: Ic92de429b4ffe516b84d5fd891722c20b137d6f6
Merge remote-tracking branch 'upstream/jb-mr1' into jb