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

Change-Id: I644e7f57d2de41da6766e67dee959ba215a43779