merge in jb-mr2-release history after reset to jb-mr2-dev
merge in master-release history after reset to master
Merge "Create arch specific versions of strcmp."
Don't search off the end of the index for bad Olson ids.

In the old code, the index was a file to itself, so it made sense to
read until you hit the end of the file. In the new code, the index is
followed by hundreds of KiB of data, so we need to just search the
index.

Bug: 8368791
Change-Id: Icf5f8b5516cf3a93679fa849c9f6cd1cb100e0f1
Merge "Don't search off the end of the index for bad Olson ids."
am f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."

* commit 'f861bc5cc3e17322e49f89deea61f278aaefbe76':
  Don't search off the end of the index for bad Olson ids.
am 2e7b8d63: am f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."

* commit '2e7b8d6399fdea6e43dd07f353346324d2bf4ec4':
  Don't search off the end of the index for bad Olson ids.
Remove unused arm defines.

The defines HAVE_32_BYTE_CACHE_LINES and ARCH_ARM_USE_NON_NEON_MEMCPY
are not used by any code. The previous memcpy code that used these
has been split into different architecture versions to avoid the need
for them.

Bug: 8005082

Merge from internal master.

(cherry-picked from commit 6e1a5cf31ba47508b08dba02a45b4ea6e1edd6d2)

Change-Id: Ib18fc3f4131b21cdbd19b9dde7697ac25d066fcf
am c9358706: am 2e7b8d63: am f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."

* commit 'c9358706c6f48eb27f785f3bf15b2ab0d50ff7bc':
  Don't search off the end of the index for bad Olson ids.
am 2d48d0ea: am c9358706: am 2e7b8d63: am f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids."

* commit '2d48d0ea36395da9af4537195483b006900bf7bd':
  Don't search off the end of the index for bad Olson ids.
Merge "Remove unused arm defines."
am d30b9f09: Merge "Remove unused arm defines."

* commit 'd30b9f0912b4763f0d98bdee23064015223ec03f':
  Remove unused arm defines.
am f694ed1c: am d30b9f09: Merge "Remove unused arm defines."

* commit 'f694ed1cdbfd2d26cdc2a008b67bfd3451522c8f':
  Remove unused arm defines.
am f85fc022: am f694ed1c: am d30b9f09: Merge "Remove unused arm defines."

* commit 'f85fc022f5ad405a7e43ecb6f48bcc6e061e01b5':
  Remove unused arm defines.
am 8dcbb90d: am f85fc022: am f694ed1c: am d30b9f09: Merge "Remove unused arm defines."

* commit '8dcbb90dea22a876d9cc517f382bb82c98d87450':
  Remove unused arm defines.
Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.

Bug: 8391426
Change-Id: Ia4a8889b5a613aa96bb3fb5d89a921c913ff7626
Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."
am 4d696eb4: Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."

* commit '4d696eb49d24590a6d6d25657b5bc0103e2d90ba':
  Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
am f8d689bc: am 4d696eb4: Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."

* commit 'f8d689bc56976f8bd37b306053154a0e9d17fb1d':
  Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.
am 9ede4549: am f8d689bc: am 4d696eb4: Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."

* commit '9ede4549fe083e54cdf2f34b177fc32777f61fac':
  Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.