Snapshot to 3fac2c96ae27d71378b421affda0caef6e5572c1
Merge remote-tracking branch 'google/kitkat-mr2-release' into kitkat

Conflicts:
	kernel
Replace kernel binary with old one (reason: unknown)