Merge "Also pin vdex file for camera" into oc-dev