Revert to aosp builder