am 909fe8e0: Merge "build: support compiling .mm on host"

author Scott James Remnant <keybuk@google.com>

Thu, 17 Sep 2015 23:15:30 +0000 (23:15 +0000)

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

Thu, 17 Sep 2015 23:15:30 +0000 (23:15 +0000)
author Scott James Remnant <keybuk@google.com>
Thu, 17 Sep 2015 23:15:30 +0000 (23:15 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 17 Sep 2015 23:15:30 +0000 (23:15 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
author	Scott James Remnant <keybuk@google.com>
	Thu, 17 Sep 2015 23:15:30 +0000 (23:15 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 17 Sep 2015 23:15:30 +0000 (23:15 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history