Revert "Merge remote-tracking branch 'aosp/jb-mr2.0-release' into jb-mr2x-test"

This reverts commit 856daf2f50a85e6a7e56a486eadcc6602dd398a4, reversing
changes made to d2ec67a0305ddb61a202edf42114ffc788f64682.