am 57ff23b0: Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"

author Dan Willemsen <dwillemsen@google.com>

Fri, 28 Aug 2015 03:49:02 +0000 (03:49 +0000)

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

Fri, 28 Aug 2015 03:49:02 +0000 (03:49 +0000)
author Dan Willemsen <dwillemsen@google.com>
Fri, 28 Aug 2015 03:49:02 +0000 (03:49 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 03:49:02 +0000 (03:49 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/clear_vars.mk
Simple merge
author	Dan Willemsen <dwillemsen@google.com>
	Fri, 28 Aug 2015 03:49:02 +0000 (03:49 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 28 Aug 2015 03:49:02 +0000 (03:49 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history