Merge "Re-pin camera odex/vdex files only if they have changed" into oc-dev