Manually merge commit 'c13da91' into stage-aosp-master

author The Android Automerger <android-build-merger@google.com>

Sat, 3 Dec 2016 04:02:09 +0000 (04:02 +0000)

committer The Android Automerger <android-build-merger@google.com>

Sat, 3 Dec 2016 04:02:09 +0000 (04:02 +0000)
author The Android Automerger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:02:09 +0000 (04:02 +0000)
committer The Android Automerger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:02:09 +0000 (04:02 +0000)
diff --cc core/Makefile
Simple merge
diff --cc core/config.mk
Simple merge
diff --cc tools/releasetools/build_image.py
Simple merge
author	The Android Automerger <android-build-merger@google.com>
	Sat, 3 Dec 2016 04:02:09 +0000 (04:02 +0000)
committer	The Android Automerger <android-build-merger@google.com>
	Sat, 3 Dec 2016 04:02:09 +0000 (04:02 +0000)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
core/config.mk	patch \|	diff1 \|	diff2 \|	blob \| history
tools/releasetools/build_image.py	patch \|	diff1 \|	diff2 \|	blob \| history