Update AOKP Branches to jb-mr2

Change-Id: I20c5c415baca9e5dd1ff796147099927b2528837