Merge "Move cplay to vendor." am: c85b75c41e
am: 69470a8bd8

Change-Id: I8f2caad10fc02fdb52b6bcfa16440d3c7309b94c