Merge "Replace DX DexMerger with D8 in platform"