Merge "Remove aprof support from the build system."
am c4c71f06: Merge "Remove aprof support from the build system."

* commit 'c4c71f06ab002c4b12042ba7752272311b62b0f9':
  Remove aprof support from the build system.
Add aosp_aarch64-eng to the default lunch menu.

Change-Id: I55f6ab6ea90670def30796fdce76c27031ecef01
Merge "Add aosp_aarch64-eng to the default lunch menu."
am 365e4439: Merge "Add aosp_aarch64-eng to the default lunch menu."

* commit '365e443995b2b33eae23ff0423a042eb52e64326':
  Add aosp_aarch64-eng to the default lunch menu.
[MIPS] Reenable linker fatal-warnings

Change-Id: I4efbb7d0b1026b49a9b8bf968dd4752fca8a543b
Merge "[MIPS] Reenable linker fatal-warnings"
am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings"

* commit '166bc090ab0ac7ac7a620889fd96656be4ca69c1':
  [MIPS] Reenable linker fatal-warnings
Fix filter rule when checking for apks in PRODUCT_COPY_FILES.

PRODUCT_COPY_FILES entries can include the src:dest:owner
syntax versus src:dest. This causes the filter to miss
certain cases. Instead use the word-colon function to
grab the dest regardless of syntax.

Change-Id: I1f4e57a236c1db148bada0cfe5bd1e87bb1194d6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Add missing paren in "java -version" check

Change-Id: Id66e795423e8d25b48ac996956748a93060ea5db
Merge "Add missing paren in "java -version" check"
am 6ec35451: Merge "Add missing paren in "java -version" check"

* commit '6ec3545158f49f521c53c9474cfb28c1a1811fd3':
  Add missing paren in "java -version" check
Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."

* commit '8d1f91fa548c80357fffbdbdd5dcccc3c461c9ec':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."

This reverts commit ca37190711ca48a6bfd6b5700a54cd580abd1e5b.

Change-Id: I3a76f4cdf92ecbe3059bf5856cf341874e1393cf
Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""

* commit '62043de346dff2d31c58bc8c002699fc74d1351c':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
Make envsetup.sh set JAVA_HOME correctly for java7.

Note that despite the location of this change, this function
is run only during "lunch" and not during ". build/envsetup.sh"

Also, make it easier to switch back and forth between java6 and 7
on the same session.

bug: 8992787

Change-Id: I56ec0ba8552b46c04204a8b96b9abc0180f7605f
Merge "Make envsetup.sh set JAVA_HOME correctly for java7."
am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7."

* commit 'f99a23b10f1d6d9cf12c6dd78700ab2186a1fdb4':
  Make envsetup.sh set JAVA_HOME correctly for java7.