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

Change-Id: I5554cd977560ec9e61a714c6925c251b3c957fa2