Revert "serrano: Remove stuff taken care of by MSM init vendor lib"

This reverts commit 338086d3d9ad57e9b3f71710445d7bd40b67e1fa.

Change-Id: I39fa968e52122a70d4b4b4f60ebd6e8a9d6c443e
serrano: Set composition type to c2d

 * We're not using qcom init vendor lib anymore, so we need
   to set this manually.

Change-Id: I9aa79dac0f9d6e9cfd34b7d38c96b041dcff575e
Merge branch 'cm-11.0' into kk_mkt