fix fork'd aosp repos