build bootstrap for remote build

Change-Id: If5022533f8cf6e41a13681d8b253a550c122aa88
Merge remote-tracking branch 'upstream/master'