Merge "Updated HALs to test structs/safe_unions containing interfaces" am: 76b383d5c2
am: 1233e0a7eb

Change-Id: I30f4061d2660f1df2151d0e5e3768d224558262d