resolved conflicts for merge of f966bda4 to master

Change-Id: Ic2a16e62c6b9683bd235673e548901381dec9322

diff --cc core/main.mk
index 6d98e94,3bbfbd5..8455204
--- 1/core/main.mk
--- 2/core/main.mk
+++ b/core/main.mk
@@@ -182,27 -180,14 +182,27 @@@ endif # if requires_openjd
  # EXPERIMENTAL_USE_JAVA7 is set, 1.6 otherwise.
  ifneq ($(EXPERIMENTAL_USE_JAVA7),)
  required_version := "1.7.x"
 -java_version := $(shell java -version 2>&1 | grep '^java .*[ "]1\.7[\. "$$]' | head -n 1)
 -javac_version := $(shell javac -version 2>&1 | grep '[ "]1\.7[\. "$$]' | head -n 1 )
 +required_javac_version := "1.7"
- java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.7[\. "$$]')
- javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.7[\. "$$]')
++java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.7[\. "$$]' | head -n 1)
++javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.7[\. "$$]' | head -n 1)
  else # if EXPERIMENTAL_USE_JAVA7
  required_version := "1.6.x"
 -java_version := $(shell java -version 2>&1 | grep '^java .*[ "]1\.6[\. "$$]' | head -n 1)
 -javac_version := $(shell javac -version 2>&1 | grep '[ "]1\.6[\. "$$]' | head -n 1)
 +required_javac_version := "1.6"
- java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.6[\. "$$]')
- javac_version := $(shell echo '$(javac_version_str)' | head -n 1 | grep '[ "]1\.6[\. "$$]')
++java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.6[\. "$$]' | head -n 1)
++javac_version := $(shell echo '$(javac_version_str)' | head -n 1 | grep '[ "]1\.6[\. "$$]' | head -n 1)
  endif # if EXPERIMENTAL_USE_JAVA7
  
 +ifeq ($(required_javac_version), "1.6")
 +$(info ************************************************************)
 +$(info You are attempting to build with java 1.6.)
 +$(info Java6 support for master builds will be dropped shortly,)
 +$(info please upgrade to Java7 as soon as possible.)
 +$(info $(space))
 +$(info Visit go/android-java7-transition for details. )
 +$(info $(space))
 +$(info ************************************************************)
 +endif
 +
  ifeq ($(strip $(java_version)),)
  $(info ************************************************************)
  $(info You are attempting to build with the incorrect version)