AOGP-ify build part 2