remove arm mode

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