Merge "Enable Instant and ABI XML tags for CtsDexMetadataHostTestCases"
am: 2e5fdc097e

Change-Id: Idc0564f64f1232f0b686bee5e3e92355669fa112