Manifest update for cm-10.2

Change-Id: I081eb4922ec7777aeade6b0265df34154f595ae1
Merge branch 'cm-10.2' into cm-10.2

Change-Id: I50f68aa709340d2be3131dac1f2d22ec0230a119