Revert "Merge remote-tracking branch 'android/android-3.0'"

This reverts commit 861d681583ecf12b2606b79443dbd14f8049cfdd, reversing
changes made to 177367ed5887c04a3a18a097a8453404f1eba763.