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

Change-Id: I438c92293259f524248eedab47083c3a77442d17