Revert "Merge remote-tracking branch 'remotes/aosp/jb-mr1-dev-plus-aosp' into jb-4.2"

This reverts commit c1892f6eed5948dbf71a3f7c665314492609b246, reversing
changes made to 2d3f537184185d9b18406755c9028f4dbc27338b.