Revert "Merge remote-tracking branch 'aosp/jb-mr1.1-release' into jellybean"

This reverts commit 2e9f1a14ea101f9361146e660fdb7966c99bc327, reversing
changes made to 30eb25b947dcab91667597934dfc4ea4a1fd6d67.