Merge "[pm] Bug fix compiling secondary dexes from cmd line" into tm-dev