Merge "releasetools: Consolidate the codes that generate metadata dict."
am: 676c20f285

Change-Id: I1b3d233b199efc03d32b9a1d17389982cb95157e