Allow passing environment also for LD_PRELOAD am: b35f2c18a0 am: 0a4d9de5f1 am: e40282680a

Change-Id: Ia88f46b12c90a9e2f24d1c701ed1509afafef25e