Merge "./update-makefiles.sh, for union changes/memory" am: 00daede4d5
am: 0942e33017

Change-Id: I9892fbefe4af535f7576e4b8ecb49abe8259bbb9