Prepare for composer

Bug: 49121
Change-Id: I7b391cc856ca4526951db409173deb0f1b955c4b
Merge "Prepare for composer"