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

Change-Id: I0d1a687ea2d90e968fe4e9705de223dc8b181238