This reverts commit 89b85843. Reason for revert: All users have moved to Soong Bug: 38456126 Change-Id: Ia2fb76ecf6cbb65231623602c722d1ad7b671ab1 Test: m