Use the same sources for linux_bionic and linux targets am: 3a5152cc05
am: a5546632ba

Change-Id: I28f1e9a3965f96e31132c95a0623d97a1ce07096