aokp_m7

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

Change-Id: I39c7d0021c6c30abc0e686057c5f0bff78b660f6