Merge "Remove dex file index building mutex."