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

Change-Id: Ie32df975278f3e35eeacd02a43f16622c026a897
skia: Rename perf flag

Change-Id: If9f0976d9ba2ec22c4d9f70f203e033662ed0580
Merge branch 'cm-11.0' into stable/cm-11.0