Merge "Make safeunion@1.0 test HAL Java-compatible"