Change build2 to support AOSP