Merge "hwc: Fix  PTOR for overlapping PTOR regions."