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

Change-Id: I64d6e3948d0b9a84a8d50e15cfd22d95a694b69a