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

Change-Id: I595c1634d518d1cd883a98386910856d7e83faf5