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

Change-Id: I440b059268b5249627cba2daa18eb331296034b7