This reverts commit 66c0c406. Bug: 112674805 Test: m checkbuild Change-Id: I687888136b570f080b57af352af0130355acd216