Merge remote-tracking branch 'google/master' into cm-12.0

Conflicts:
	fstab.deb
	init.deb.rc
	overlay/frameworks/base/core/res/res/values/config.xml

Change-Id: I05840779b36e9578d34270d1856fe089c7c32c1b