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

Change-Id: Ib1f118decef1dd6f27049b3ae156dc108cc710a8