Add linux_bionic support am: 6f3263d5f4 am: 77d66d57c7
am: f25f22e1b0

Change-Id: Idb49c352269c8823acdad7bc1f7f20fc3fcde728