Merge remote-tracking branch 'remotes/aosp/master' into mergeme

Conflicts:
	AndroidProducts.mk
	BoardConfig.mk
	BoardConfigCommon.mk
	CleanSpec.mk
	audio/Android.mk
	audio/audio_hw.c
	bluetooth/bdroid_buildcfg.h
	device-common.mk
	device.mk
	factory-images/generate-factory-images-package.sh
	fstab.grouper
	full_grouper.mk
	init.grouper.rc
	init.grouper.usb.rc
	media_codecs.xml
	media_profiles.xml
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/frameworks/base/core/res/res/xml/storage_list.xml
	proprietary-blobs.txt
	vendorsetup.sh

Change-Id: I195fd860f96e47dd0054a9a0beb3c240d09f068f