am 782b98ea: Merge changes I3ca9ed36,Ibd7eec5c

author Dan Albert <danalbert@google.com>

Wed, 23 Sep 2015 23:47:37 +0000 (23:47 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 23 Sep 2015 23:47:37 +0000 (23:47 +0000)
author Dan Albert <danalbert@google.com>
Wed, 23 Sep 2015 23:47:37 +0000 (23:47 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 23 Sep 2015 23:47:37 +0000 (23:47 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/clear_vars.mk
Simple merge
author	Dan Albert <danalbert@google.com>
	Wed, 23 Sep 2015 23:47:37 +0000 (23:47 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 23 Sep 2015 23:47:37 +0000 (23:47 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history