Merge "dump_hals_for_release: account for numbers in file name" am: 9a9b8e2bd8 am: 9dfb0df7a4
am: 774d4befde

Change-Id: I388454e32c4cacc99cf12408d8068e5e67116d05