Merge "Add environment flag to disable gcov path config." am: 27b096e4d6
am: 3c98114a00

Change-Id: I6a42d9ad2c75a7ebf569d1085a31390f42e0353d