kltevzw: Re-order product inheritance

Change-Id: I70a55ed27fd3eebdce864a8d2cdada6c24eb9c5b
Merge remote-tracking branch 'cm/cm-12.0' into HEAD