Track more repos from CM upstream

Change-Id: I9174c04e4931ddcf78c473c8001fb1450c6a0df8