Fix makefile call order
Merge remote-tracking branch 'upstream/cm-11.0' into kk4.4