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

Change-Id: I241735ef8fa01a0210582c145b26b4d50a713855