update to aospa-legacy repos 

and switch a few aosp repos to cm