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

Change-Id: I7ade7752cd854613ddd01228addc8310458ce687