This reverts commit d29e551e. Reason for revert: some targets are broken Bug: 142773030 Change-Id: I50ac6842ab8aa572c11262ee0ec965ddbe903b0e