Merge "Revert "Make bullhead use HWC2to1Adapter in surface flinger""