am cd7dfdb4: Merge "Cleanups."

author Ying Wang <wangying@android.com>

Tue, 21 Jul 2015 23:57:42 +0000 (23:57 +0000)

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

Tue, 21 Jul 2015 23:57:42 +0000 (23:57 +0000)
author Ying Wang <wangying@android.com>
Tue, 21 Jul 2015 23:57:42 +0000 (23:57 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 21 Jul 2015 23:57:42 +0000 (23:57 +0000)
diff --cc core/clear_vars.mk
Simple merge
diff --cc core/config.mk
Simple merge
diff --cc core/definitions.mk
Simple merge
diff --cc core/package_internal.mk
Simple merge
author	Ying Wang <wangying@android.com>
	Tue, 21 Jul 2015 23:57:42 +0000 (23:57 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 21 Jul 2015 23:57:42 +0000 (23:57 +0000)
		1	2
core/clear_vars.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/definitions.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/package_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history