Merge "Set the location checksum in vdex."
am: 3acf361425

Change-Id: If6650c2962be548c47f635500c18563df2cff5dc