am ca0b172f: am 2cdf9b26: Merge "Let aosp_arm64 / emulator assume NEON / cortex-a15." into lmp-dev

* commit 'ca0b172f82fd2b1a7b54a72f8c610eaa16dbc424':
  Let aosp_arm64 / emulator assume NEON / cortex-a15.