Fix buildbot build script. am: 6079d65f09 am: 033fe9b1d0

Change-Id: I9900c0393fc4aad2317c6a4c32a2795b8e9cc893