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

Change-Id: Ib7f9bfd72396c4273abd1b1ba26e1471f5de45b3