Merge Android 4.2.2r1
Revert Display driver to AOSP ones