Merge "Fix DexMetadataHostTestCase" into pi-dev