Merge "Have Golem build bootstrap Bionic libraries on target."
am: 196cd05262

Change-Id: If7c76f90d9d7967cdb4405ca377cb62d2f92256b