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

Change-Id: Ia6fa6e66c9d104cc6b274f885e8d2a5ff8d0e721