Merge AOKP (JB-MR2) into kitkat