Merge "Move cplay to vendor." am: c85b75c41e am: 69470a8bd8 am: a6b05e6543
am: 0aa94d40d1  -s ours

Change-Id: I388dec64e4d49bc67d97b3d58dea836c733109ea