Pull in more moto variant repos

Change-Id: Ibc855de14831000a04565555d04e25a9d327ba81
Merge "Pull in more moto variant repos" into kk44