Merge "Adjust the validation code for secondary dex paths" into oc-mr1-dev