Revert "Update for android release 4.2.2 r1.2"

This reverts commit 8fc47215641cc4b9fdd09f524e0a92802b311716.