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

Change-Id: Idfd935ad012f4ada1c727e2185c8bbfa2c1359a3