am e98755f9: Merge "Add a SANITIZE_HOST flag."

author Dan Albert <danalbert@google.com>

Tue, 9 Dec 2014 13:18:44 +0000 (13:18 +0000)

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

Tue, 9 Dec 2014 13:18:44 +0000 (13:18 +0000)
author Dan Albert <danalbert@google.com>
Tue, 9 Dec 2014 13:18:44 +0000 (13:18 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 9 Dec 2014 13:18:44 +0000 (13:18 +0000)
diff --cc core/binary.mk
Simple merge
diff --cc envsetup.sh
Simple merge
author	Dan Albert <danalbert@google.com>
	Tue, 9 Dec 2014 13:18:44 +0000 (13:18 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 9 Dec 2014 13:18:44 +0000 (13:18 +0000)
		1	2
core/binary.mk	patch \|	diff1 \|	diff2 \|	blob \| history
envsetup.sh	patch \|	diff1 \|	diff2 \|	blob \| history