Merge "gui: add hidl hybrid interface as libgui header dependency"
am: 8101dfa9ae

Change-Id: I9f5ee2539b98f039a991c608030d4f0a5c2caa72