Merge changes Ib6ffcc38,Ia58e6bc1

author Dan Willemsen <dwillemsen@google.com>

Thu, 16 Jun 2016 15:50:46 +0000 (15:50 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 16 Jun 2016 15:50:46 +0000 (15:50 +0000)
author Dan Willemsen <dwillemsen@google.com>
Thu, 16 Jun 2016 15:50:46 +0000 (15:50 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 15:50:46 +0000 (15:50 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
diff --cc core/prebuilt_internal.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Thu, 16 Jun 2016 15:50:46 +0000 (15:50 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 16 Jun 2016 15:50:46 +0000 (15:50 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/prebuilt_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history