Merge commit 'android-4.2.1_r1.2' into cm-10.1

Change-Id: Icc6a9366b3d6b184328ecbebca2c6c54f71af53f
Updates for mr1.1

Change-Id: I8985aab7f32b18ce3e152908c35e7d00237ba114
add widevine to proprietary-blobs

These are needed to playback drm encoded
content (such as Hulu Plus).

Change-Id: I2712ed512f3f8562d6f43cce48309c22563b7e69
Remove test/debug props taken out of 4.2.2

Change-Id: Iff91682ce309144960ad45370ad401d609cbcc67
Remove OLD_ION flag

This has now a different meaning and applies only to libion. The
default status of display-caf changed to AOSP compatibility

Change-Id: I96c89e2f945281ff1aefacce5d9a5113459b13e7
mako: enable pre-rotation

Bug: 7435860
Change-Id: I4f063edd322d308485ec9c74b57ac6091da75b92
Signed-off-by: Iliyan Malchev <malchev@google.com>
Add mako's audio package

This is labeled as being for mako, so use it

Change-Id: Ic4f0b295ce27d084dfb4b44f3a58dbbe5b1416a1

Conflicts:

	device.mk