update buildscript, cherry-pick fail

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>