Revert "Merge branch 'googlesource.com/android-3.0'"

This reverts commit 31a8f155dc2ecbddfdb3f6c7af2fedbeca15a75a, reversing
changes made to 9cde60911a1ac99fe63ee7c676094eba2d5893a2.