Dokdo_build

Conflicts:
	CleanSpec.mk
	buildspec.mk.default
	core/Makefile
	core/apicheck_msg_current.txt
	core/base_rules.mk
	core/binary.mk
	core/build_id.mk
	core/cleanbuild.mk
	core/combo/HOST_darwin-x86.mk
	core/combo/TARGET_linux-arm.mk
	core/combo/arch/arm/armv7-a-neon.mk
	core/combo/select.mk
	core/config.mk
	core/definitions.mk
	core/dex_preopt.mk
	core/distdir.mk
	core/droiddoc.mk
	core/dumpvar.mk
	core/dynamic_binary.mk
	core/envsetup.mk
	core/host_java_library.mk
	core/java.mk
	core/java_library.mk
	core/main.mk
	core/notice_files.mk
	core/package.mk
	core/pdk_config.mk
	core/product.mk
	core/product_config.mk
	core/raw_executable.mk
	core/static_java_library.mk
	core/tasks/apicheck.mk
	core/tasks/collect_gpl_sources.mk
	core/tasks/product-graph.mk
	core/tasks/sdk-addon.mk
	core/version_defaults.mk
	envsetup.sh
	target/product/base.mk
	target/product/core_base.mk
	target/product/embedded.mk
	target/product/full_base.mk
	target/product/full_base_telephony.mk
	target/product/generic_no_telephony.mk
	target/product/large_emu_hw.mk
	target/product/sdk.mk
	target/product/telephony.mk
	tools/releasetools/common.py
	tools/releasetools/edify_generator.py
	tools/releasetools/ota_from_target_files