Merge "Delete HWC2to1Adapter unused code."