This reverts commit a558be64. Reason for revert: broken build was fixed Bug: 253033919 Test: build Change-Id: If6adf2ece00081eb2eeec7895461293751f94be1