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

Change-Id: I101f16381169c2fca551ebad55f128fc1efe7401