We need to pass these on through environment otherwise we are overriding the whole build flags. Change-Id: I3fd856af2624f84afe73427dfb359e8bfc3acaa8 Fixes: commit f791bf03f9
f791bf03f9