Make builds reproducible
am: c55762da91

Change-Id: Ibe63928b9139db9b1bd3659b4554d78f50c888c0