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