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

Change-Id: I24607ab97be3acbb06cac8f2c78416ae092865eb