Update makefiles for safe_union Monostate.
am: ed6ffd1678

Change-Id: Iaace893e7a33961270503ef02f745ba64cef7aa1