Revert "Merge remote-tracking branch 'aosp/master' into jb-mr2x"

This reverts commit 580b6b944c4b1a3acc6ac8837b5f34c4de2bdc44, reversing
changes made to 9339001241ae6b23680882ee9a572d3b6aeeb77f.