Merge "hwc: Remove external only feature related code"