Merge AOKP (JB-MR2) into JB-MR2