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

Change-Id: I1a8e68d28db55a48741b8de15e24f6ad93797ae9