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

Change-Id: Idc4e831bdb1c4893322b78257672653fd0933b49