Merge "Update for cleanups in hwc interface" into jb-mr1-dev