Merge "Build init with the bootstrap bionic libs"
am: 3ffb4ab82a

Change-Id: I2ca03a386a4121f30e77b6f6b46c155f5a3865dd