Revert cm vendor

Change-Id: Ic4d05dc06670d20279f16b622393d663e94ee6b1