moto_msm8960_jbbl: Fix vendor inheritance

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