Merge "Select correct oat/odex when pinning the Camera APK" into oc-dr1-dev