Add linux_bionic support am: 6f3263d5f4
am: 3456dd461f

Change-Id: I813d6434023c3cea0fae757a2940ad8e1ed34aab