Merge "Move cplay to vendor."
am: c85b75c41e

Change-Id: I9791826235e76bff25cdb497e324ae8210bc3d4d