We are avoiding LOCAL_CFLAGS when compiling assembly code.

Bug: 6967574
Change-Id: Ia696b884cf50e943ae969b377f122e4d5d8f7776
am 55e323d4: am 031072f0: am 57573862: Merge "hardening: eliminate all text relocations from lidbvm"

* commit '55e323d4a2d794dc3b00c34fc05602647591da39':
  hardening: eliminate all text relocations from lidbvm
am 15e3b32a: Merge "Multi-user external storage support." into jb-mr1-dev

* commit '15e3b32a0a6dd9788ce2a5fad07600b8aa26fb38':
  Multi-user external storage support.
Unnessary LOCAL_MODULE_TAGS

Change-Id: I77b9b58180f7036ae8873ae2511e664eeb3b5f05
am a20bc3ba: am 1129f6a7: am b931f906: Merge "Upgrade to dlmalloc 2.8.5."

* commit 'a20bc3bada66210e4fb76352bf29cb3c2b41f7b3':
  Upgrade to dlmalloc 2.8.5.
am 821ab588: Ensure we fence the writing of clazz to an Object post allocation.

* commit '821ab588af4566a800d4b5608092ccc1dd3764af':
  Ensure we fence the writing of clazz to an Object post allocation.
am 3b93aad3: Revert "Ensure we fence the writing of clazz to an Object post allocation."

* commit '3b93aad3e70c0b369ce922d92e5ab154320c401c':
  Revert "Ensure we fence the writing of clazz to an Object post allocation."
am 729eebbb: Revert "Upgrade to dlmalloc 2.8.5."

* commit '729eebbb4e4ec5b826b7230b4c02267da341b70b':
  Revert "Upgrade to dlmalloc 2.8.5."
am 3cfa40b4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '3cfa40b4afbaebc80810b0efaa3763d8af0d040c':
  Revert "Upgrade to dlmalloc 2.8.5."
  Revert "Ensure we fence the writing of clazz to an Object post allocation."
am 40d3cc61: am b88891a2: Merge "Iteration on multi-user external storage." into jb-mr1-dev

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

* commit '1a90101b3f9c88109dfd01fbff3be764a7bd4646':
  One more errno for encrypted devices.
am eba1a36f: (-s ours) am 42106ef4: Merge "Fix build warning." into jb-mr1-dev

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

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

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

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

* commit '59d9999f713cabe68db8c75e5436a8bb2f992b7e':
  Fix for 6994917 GC is slower since JOO33B per FrameworkPerf test
am b1452579: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b1452579d000f56b078c1cc537f0028fe9224b61':
  One more errno for encrypted devices.
am 6fc13d33: am 46f57f4d: am cc686898: am f6104618: Merge "Fix a bug where debugInfos\' size wasn\'t being computed."

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

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

* commit '6c4ad86d11ec0ac2bf787e6912918757b57b378d':
  Revert "Revert "Upgrade to dlmalloc 2.8.5.""