Remove device branches and swap out other branches with the more-updated CM branches

Change-Id: Iffe2040f406202566fe702e4373654cb490d905a