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

Change-Id: I08e0d63fd1faf87d2a0aeb8592900df7b54951e3