display: rebase hwc to aosp-new/kk-mr1-dev