Merge "Delete unused mutex in HWC2to1Adapter"