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

Change-Id: I89e490b3fa17dcbb6b04a7bfd494c2c0b8324ffc