Merge "Accept DexMetadata files (.dm) for install-multiple" am: d560f39fd7
am: d856c9c2c5

Change-Id: If99793b8c684087293f3fd0c705bdae3955dd7f0