CM on Emulator [ARM]

Change-Id: Icfd3341b2d1c75074d7ec7a876b2f7157736bc94
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1