Merge "Make safeunion@1.0 test HAL Java-compatible"
am: 314f9503a9

Change-Id: Ieaad7392eb81605d1ae0b626db5c1f336eb6d10b