Update makefiles for safe_union Monostate. am: ed6ffd1678
am: 5ae59862b9

Change-Id: Ic45e257463fdfc527c0d2479a44879eb6e8ef129