Android 4.3 release 2.2
Merge remote-tracking branch 'goog/jb-mr2-zeroday-release' into HEAD

Conflicts:
	fstab.deb
	init.deb.rc