Revert "Track CM's android_build"

This reverts commit 0dd4135759cecef409e1d7b1914d32dd68b08fe7.