update for 4.2.2

Change-Id: Idb803cc6af5c0422d0aa1ac4b1e4a3c72a9cbb68
Merge branch 'jellybean-mr1' of ssh://github.com/ChameleonOS/android into jellybean-mr1