Merge "Revert "Revert "Check prebuilt sources during checkbuild"""

author Colin Cross <ccross@android.com>

Sun, 30 Oct 2016 22:14:23 +0000 (22:14 +0000)

committer android-build-merger <android-build-merger@google.com>

Sun, 30 Oct 2016 22:14:23 +0000 (22:14 +0000)
author Colin Cross <ccross@android.com>
Sun, 30 Oct 2016 22:14:23 +0000 (22:14 +0000)
committer android-build-merger <android-build-merger@google.com>
Sun, 30 Oct 2016 22:14:23 +0000 (22:14 +0000)
diff --cc core/main.mk
Simple merge
diff --cc core/prebuilt_internal.mk
Simple merge
author	Colin Cross <ccross@android.com>
	Sun, 30 Oct 2016 22:14:23 +0000 (22:14 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sun, 30 Oct 2016 22:14:23 +0000 (22:14 +0000)
		1	2
core/main.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/prebuilt_internal.mk	patch \|	diff1 \|	diff2 \|	blob \| history