Revert android_build tracking