CL https://android-review.googlesource.com/#/c/420720/ is
breaking several internal builds, and CL
https://android-review.googlesource.com/#/c/422480/ must
be reverted beforehand.
This reverts commit a0b7f12eb7.
Change-Id: I5883409452d39e1834e183aa7b5ccdbf14291ca5