Merge "HWC2On1Adapter: Fix fd leak in Layer::dump" am: 2e38b2c0f6 am: 28172ae62a
am: 7ba269ea79

Change-Id: I87530cfb3908ca158d96d9bc3ad6e4be91df1ade