Merge "Include libwrapagentproperties in buildbot-build.sh"
am: 1fdc4e3e31

Change-Id: I54205397fe8c4daef44957914eb2f51c17360b29