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

Change-Id: I682843c8b76fc7249d6210aad2b344e463c8966a