merge linaro/linaro_android_4.2.2 with pac/cm-10.1

Change-Id: Ie75b1be23f8c68a1f06115750ef99fcd37fe5917