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

Change-Id: I15f00c18c7280c0e36b257cbc7f453fd94419db3