Merge "Remove dependency on libcompiler_rt.so for RS compatibility."
Merge "build: local_manifest.xml deprecated, use local_manifests" into cm-10.1
JWQ44B
Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.

Because every ARM architecture we've ever supported has had both.

Change-Id: I607b56416e65073c5ac1b85fb17c092516e02573
Merge "Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS."
am 07a58f8f: Merge "Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '07a58f8fef9ba3ce7454771049522e3fd75f4f6c':
  Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.
am d0fb6930: am 07a58f8f: Merge "Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS."

# Via Android Git Automerger (1) and others
* commit 'd0fb693024b88a713fe95296db451a0e6c17ec66':
  Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.
merge in jb-mr2-release history after reset to master
JWQ45
Remove more always-true ARCH_ARM_HAVE_ flags.

All the remaining flags appear to be actually used.

Change-Id: I0e3d84915487eda4f0e97809fc36624fef5f1848
Merge "Remove more always-true ARCH_ARM_HAVE_ flags."
kernel: Ignore errors with module building

Let kernel fully disable loadable modules

Change-Id: Ia37ec927b092c041ee4c68bf9fd0f28b7339c8ca
JWQ45B
am f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f6b670b702c3f9ba307ddd0751d471116d9d1a90':
  Remove more always-true ARCH_ARM_HAVE_ flags.
am ea852f6e: am f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags."

# Via Android Git Automerger (1) and others
* commit 'ea852f6ed3e9f251eaef4f041fbc0b09229ac924':
  Remove more always-true ARCH_ARM_HAVE_ flags.
Merge branch 'mr1.1-staging' of git://github.com/CyanogenMod/android_build into mr1.1-staging
Add new version to qcom_utils.mk

Change-Id: I1ca1532fd4968450715ecd0cca7729e0e6d507ef
build: Enable Bionic optimizations on Cortex platforms

 * Enable the new NEON optimizations in Bionic when
   TARGET_ARCH_VARIANT_CPU is set.
 * NEON memcpy() optimization is disabled on A15 due to a regression.

Change-Id: I4862695812a70b75bdabc4398cb592157f3913c6
Merge "For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang."
am 5e12e60b: Merge "For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang."

* commit '5e12e60b472fbd2e712ee9ba04637e3d26b18b71':
  For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang.