Track a few CM externals

Change-Id: I742a0b6d6625966d0efa065015c3f18d2d032be3