Revert "A metric-butt-ton of cherries from AOSP's Gerrit."

This reverts commit 3cb021b8e75507d7e64e9e0f6f982d081adedddf.