Android 6.0.1 release 5
am e6574c69: (-s ours) am 53d34763: am a1d8ac0a: Purge non-NEON ARM code. DO NOT MERGE

* commit 'e6574c69d974ed0ca4bf392fcf7854ada466eae7':
  Purge non-NEON ARM code. DO NOT MERGE