Merge "Include libwrapagentproperties in buildbot-build.sh"