Go back to AOSP instead of CM for a few repos