am 084209e2: (-s ours) Merge "CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime"

* commit '084209e27848eb91e0174e3583eafef3561aac24':
  CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime
am 601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit '601d39b688bcbb1789e145d1b72753206c24d374':
  build: Rename persist.sys.dalvik.vm.lib to allow new default
am aae47044: Merge "CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit 'aae470446504a869db05f9b70b7146ea47d746d5':
  CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
am 5608a8c6: Merge "Add 64-bit gdbclients."

* commit '5608a8c6e86381cdabc46c3a9b90564411771796':
  Add 64-bit gdbclients.
am a77456b8: Merge "Dedup the targets and dependencies of required modules."

* commit 'a77456b8e8a5e66705e48e1ec4eebc1889553c6a':
  Dedup the targets and dependencies of required modules.
am 5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base."

* commit '5352018b0b115061bce7a2aac14780ffea3885c7':
  Add new rs directory to list of Java subdirs of fw/base.
am 717de0f5: Merge "Fix installing 2nd arch shared libraries"

* commit '717de0f553dc3c1a2baa0cc988af1adc5b26dba8':
  Fix installing 2nd arch shared libraries
am 054b0274: Merge topic \'arm64\'

* commit '054b0274fc27babb42a60002ad25c9e608eac257':
  add support for more LOCAL_*_arch variables
  don't rename 32-bit executables to *_32
  remove 2nd arch from ARCH_ARM_* defines
am afbbce3f: Merge "Add library test makefile solutions."

* commit 'afbbce3ff1d2d94e54f48d748d18796ce671fce9':
  Add library test makefile solutions.
am efb9603a: Merge "[MIPS64] Add mips64 target"

* commit 'efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
  [MIPS64] Add mips64 target
am 8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."

* commit '8b20d5b97e98ddac6031cb555078f425aef1da8f':
  Turn 64-bit-related warnings into errors on 64-bit builds.
am 5e9a2033: Merge "don\'t rename 32-bit packages to *_32"

* commit '5e9a20337e1110868296c27f201e4579e5e3fb9e':
  don't rename 32-bit packages to *_32
am 737a51dd: Merge "Refactor llvm_config.mk and support the 2nd arch"

* commit '737a51dd7294b0443b4f1ac55372310d635c5121':
  Refactor llvm_config.mk and support the 2nd arch
am 5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch."

* commit '5cc7f8a720fdeb2c2ec46b6ec212d05587e76163':
  Select the arch_variant_cflags for the 2nd arch.
am 6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"

* commit '6c5d89764848b604c01d0dca7104d9e075aed2b2':
  Refreshed gcc predefines __ANDROID__
am 145562fc: Merge "Add missing font files to SDK system images."

* commit '145562fcef979e4fea946987717618dba6148aeb':
  Add missing font files to SDK system images.
am ba46260f: Merge "Runtime resource overlay, iteration 2"

* commit 'ba46260f8dee97138d2eb456560b45eb9f914930':
  Runtime resource overlay, iteration 2
am 90ed06ef: Merge "fix 2nd target clang prebuilt paths"

* commit '90ed06ef84aee84dfc1edba1503a2b2036fc867d':
  fix 2nd target clang prebuilt paths
am 993ffb80: Merge "Add all-S-files-under."

* commit '993ffb802ee90e07e73e67e523fd040395dfd74d':
  Add all-S-files-under.
am b12cce10: Merge "Refine module name resolving in multilib build"

* commit 'b12cce10fab8c9adda213506be4ce675104655da':
  Refine module name resolving in multilib build