Merge "Adjust the validation code for secondary dex paths" into oc-mr1-dev am: 495157b05c
am: 12ea24c31c

Change-Id: I6724cbe100fb0c2469bd8d02728c2850868e2c2d