Merge "HWC2On1Adapter: Fix fd leak in Layer::dump"