Update to 4.2.2

Change-Id: Ie7ccc25da781204d65fdfc24cf100e648a4074c0

Conflicts:
	default.xml
Fix sync

Change-Id: I76f024c0222e65b40fa3421a398eb894fe8f4ce3
Track inline with AOKP

Change-Id: I707b74a283c1ae4e7265bb3722837ee4ed616dd4