Merge "Handle verify-profile and bootclasspath classes in vdex."