Don't try to compile ARM assembly when we're not compiling for ARM.

Change-Id: Ie32df975278f3e35eeacd02a43f16622c026a897
Merge remote-tracking branch 'cm/cm-11.0' into HEAD