Merge "Bug fix compiling secondary dexes from cmd line" am: 9cd68de124 am: 6e933d8124

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990974

Change-Id: I5fb05ff7ae0c350f9fd86a29479b772ec24bff8d