Revert "Remove non-required build targets from buildbot-build.sh" am: 761ee21756

Change-Id: I93834f602edb68bb34b21fd4b1a312938d10b5da