Merge "Also pin vdex file for camera" into oc-dev
am: 540c5bd354

Change-Id: I4c78a055bdba42b0dc6050e0b06d606b65ec380d