We are avoiding LOCAL_CFLAGS when compiling assembly code.

Bug: 6967574
Change-Id: Ia696b884cf50e943ae969b377f122e4d5d8f7776
Reconcile with jb-mr1-release - do not merge

Change-Id: I3fe6509183beaa0dab8b3525d5bd70c7f5fd84c1
am b88891a2: Merge "Iteration on multi-user external storage." into jb-mr1-dev

* commit 'b88891a2f40a47aef0cab76dc5b696812359f8bb':
  Iteration on multi-user external storage.
am af02f574: One more errno for encrypted devices.

* commit 'af02f57404b28590b34fa3777a381c13e3c956eb':
  One more errno for encrypted devices.
am 42106ef4: Merge "Fix build warning." into jb-mr1-dev

* commit '42106ef49501a0c72cda9e80b81e82b8254390ab':
  Fix build warning.
am df6983ae: am bd561cbf: am a9dd9337: Merge "Trim pre-Zygote fork, fix under-estimate of heap limit."

* commit 'df6983ae4d02247277502479179167aa64d94a4f':
  Trim pre-Zygote fork, fix under-estimate of heap limit.
am f314511b: am 6464661f: am b48569ac: Merge "Fix build warning."

* commit 'f314511baafba3a20d370d8128931c1586948eb2':
  Fix build warning.
am 4c7e2718: Revert "Trim pre-Zygote fork, fix under-estimate of heap limit."

* commit '4c7e27186d87ccd40646fd4f514dc982ff5b40b1':
  Revert "Trim pre-Zygote fork, fix under-estimate of heap limit."
am fc2d0f2a: am f76ab40f: am ecda5d85: Merge "Fix for 6994917 GC is slower since JOO33B per FrameworkPerf test"

* commit 'fc2d0f2a17167756d0e4a03c3de9f63f8f301674':
  Fix for 6994917 GC is slower since JOO33B per FrameworkPerf test
Reconcile with jb-mr1-release - do not merge

Change-Id: Ib08f0574bce5b926a38d9a0fd428da003e7cf2c3
am 46f57f4d: am cc686898: am f6104618: Merge "Fix a bug where debugInfos\' size wasn\'t being computed."

* commit '46f57f4da2f75daadda008d28f9199f9e971f087':
  Fix a bug where debugInfos' size wasn't being computed.
am a78e89c8: am 4014e152: am a5731795: Merge "Correctly handle switches on values in a high register"

* commit 'a78e89c828cbb8a6befecf6c703612309b85d448':
  Correctly handle switches on values in a high register
am 808a7c0e: Revert "Revert "Upgrade to dlmalloc 2.8.5.""

* commit '808a7c0e7e39b7ca3c7db1366e6e4089166052bb':
  Revert "Revert "Upgrade to dlmalloc 2.8.5.""
am 2f30ef57: Revert "Revert "Trim pre-Zygote fork, fix under-estimate of heap limit.""

* commit '2f30ef57ceb02ee5d6719d2158bd9bca4723687d':
  Revert "Revert "Trim pre-Zygote fork, fix under-estimate of heap limit.""
am f646cb9e: am 8e98f776: am 3e46814d: Merge "Don\'t crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."

* commit 'f646cb9e717e4937255ae8bd72bed212b275de44':
  Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup.
am e66f926b: Merge "Shared OBB storage across users." into jb-mr1-dev

* commit 'e66f926bf413bbf3f1cde05bbe50b83043829056':
  Shared OBB storage across users.
am a018360c: Merge "Access to all users\' external storage." into jb-mr1-dev

* commit 'a018360cab83a505d9f50338df20e4d495e4424d':
  Access to all users' external storage.
am b760cb53: am 93ee4913: am f3b60d2f: Merge "Fix a bug where the max blowup of annotations was incorrect."

* commit 'b760cb537b8a63e23055ede9b1fcc11952c01785':
  Fix a bug where the max blowup of annotations was incorrect.
am 2004e4eb: am 86e036a8: am e6516a53: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly."

* commit '2004e4eb058ca637f44501f738258b27a93b3f5b':
  Fix an ugly bug where try/catch offsets weren't being mapped properly.
am aa5ba914: am e599c468: am cfeacbdd: Merge "Remove unnecessary compiler pragma."

* commit 'aa5ba91402f60e6beba38d45903a71366ad3c9c1':
  Remove unnecessary compiler pragma.