[automerger skipped] Merge "gui: add hidl hybrid interface as libgui header dependency" am: 8101dfa9ae am: e951b2a649 am: 093cfb04fa
am: b122451f89 -s ours
am skip reason: SHA1 b122451f89 skipped by user marcone

Change-Id: I1ed151ac4e5ccb34e3fe2d2c3de879ccb256f054