Merge "Build vgdb and lackey tools" am: 4d49239373
am: 58ec2b6685

Change-Id: I6f1b9a8e91b235d462c047df7e36fe972f31fafa