We are avoiding LOCAL_CFLAGS when compiling assembly code.

Bug: 6967574
Change-Id: Ia696b884cf50e943ae969b377f122e4d5d8f7776
am 437f58a5: am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.

* commit '437f58a5d25d76aa035c53e341e2516e39a70927':
  Fix alignment when recompacting a DexMerger result. do not merge.
am b6f4e037: am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."

* commit 'b6f4e0372154191bdf1ee32727aead1fe1200cbc':
  Revert "Fix alignment when recompacting a DexMerger result. do not merge."
am ce0723cc: am 437f58a5: am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.

* commit 'ce0723cc425223c0e93ab0ce1968822c5ef9d352':
  Fix alignment when recompacting a DexMerger result. do not merge.
am a3df5b58: am b6f4e037: am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."

* commit 'a3df5b58369667f2fb3c4616f7e175b6ec7db412':
  Revert "Fix alignment when recompacting a DexMerger result. do not merge."
am 96cdc4ca: am ce0723cc: am 437f58a5: am 2d2f13c5: (-s ours) am 707ebe9f: Fix alignment when recompacting a DexMerger result. do not merge.

* commit '96cdc4cacdae25302cb5ec79e43063140411cbb7':
  Fix alignment when recompacting a DexMerger result. do not merge.
am f118a9fc: am a3df5b58: am b6f4e037: am afe3a013: (-s ours) am 288f2280: Revert "Fix alignment when recompacting a DexMerger result. do not merge."

* commit 'f118a9fce9f661406835d4e218db91b04bd923dc':
  Revert "Fix alignment when recompacting a DexMerger result. do not merge."
am a6f7a22e: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge

* commit 'a6f7a22e9902ce6e550ca0650caaecb69d963135':
am 49761fc0: Merge "[MIPS] Fixing FP registers fs0 and fs1 corruption bug."

* commit '49761fc08d04f784f2499c05785cd5e524b9e431':
  [MIPS] Fixing FP registers fs0 and fs1 corruption bug.
am 7f98dcfc: Merge "[MIPS] Fix several profiling issues caused by incorrect register saves"

* commit '7f98dcfc19848e061ed1291190c5619b092a3fb0':
  [MIPS] Fix several profiling issues caused by incorrect register saves
am 32155bb0: Merge "[MIPS] Fix DDMS(profiling) bug."

* commit '32155bb0b07f3865173978f488d775e59a471b81':
  [MIPS] Fix DDMS(profiling) bug.
am 0b4e2c8c: Merge "remove duplicated call to dvmJitCalleeSave()"

* commit '0b4e2c8cd485551a764910864fa1fdac389ce8bf':
  remove duplicated call to dvmJitCalleeSave()
am c375ac33: Merge "Use ALOGE rather than SLOGE for mountEmulatedStorage failures."

* commit 'c375ac332911cfea8e6570e2681cf79ad5220edb':
  Use ALOGE rather than SLOGE for mountEmulatedStorage failures.
am 318e4faf: Merge "JIT: Performance fix for const doubles"

* commit '318e4faf2a3c3b6a7b4bc442c9220160f21972e3':
  JIT: Performance fix for const doubles
am c2228b7f: Merge "Remove dvmFindInterfaceMethodInCache2."

* commit 'c2228b7feb1ed2b143666ae1a664c1cc4188ec48':
  Remove dvmFindInterfaceMethodInCache2.
am 74eb48fe: Merge "Don\'t cache failures in the interface cache."

* commit '74eb48fe1a362b763461bf36d31c9d901a7866b6':
  Don't cache failures in the interface cache.
am eeae8a89: Merge "ExceptionInInitializerError should wrap only non Error exceptions."

* commit 'eeae8a8926f647133dc858661b5b167595cf7f30':
  ExceptionInInitializerError should wrap only non Error exceptions.
am 193a551a: Merge "Fix handling of annotations whose classes are missing at runtime."

* commit '193a551a1b699e96f5bc6ccdcba36aa175d1c4bd':
  Fix handling of annotations whose classes are missing at runtime.
am 48b95902: Merge "Possible leak in dvmAllocRegion"

* commit '48b9590264d6f7ca683385c6fac6d98e6d9735fb':
  Possible leak in dvmAllocRegion
am 0e84ab50: Merge "Fail if the new index is out of range."

* commit '0e84ab50c525e144b4dc52f38a3ac4a08e4ad6f6':
  Fail if the new index is out of range.