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

Change-Id: I498941457eba58e39d1a57238ed3c7e66cb278e3