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

Change-Id: Ie67ccdf2decd3643936793a17d23646452a227b2