Track CM's android_build

Change-Id: I7b291eb28506b9913e77e30bf04ba74597fbf74f