AOGP-ify build part 3