Merge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc-dev