Merge "Revert submission "Introduce a mode for HWC2 to talk to HIDL graphics HALs directly""