Switch some repos to AOSP based versions

Change-Id: I2be8e822332dba17fb3d62c097392e48488e735f