Merge "Fix memory leak in HWC2to1Adapter"