Merge "Stop building against core_platform where possible"
tree: c29de129b250b6844feba368626fb25a20de193a
  1. apex/