Revert "Merge Android 4.2.2"

Going to do some other things before i merge this again

This reverts commit 641a9c9eb65a8078f346911bf8fcb8054dba3493.