Fix 4.2.1 tenderloin build for our environment

Change-Id: I2b974b3406d4e0e3ff169d4df19552e1ebea5bcf