Merge branch 'kk_2.7_rb1.17' of git://codeaurora.org/platform/hardware/qcom/display into cm-11.0