./update-makefiles.sh, for union changes/memory
am: 14d87a9efb

Change-Id: I1a98f3d82e2d467a82d537cb1b686ab505a88d0f