Merge "Also pin vdex file for camera" am: d4ae914be2
am: a433a9d9f4

Change-Id: I943815b1e8b29734224d49140a667bf4d7d23b8f