Merge "Bug fix compiling secondary dexes from cmd line"