Merge "Change kMultiDexSeparator from ':' to '!'"