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

Change-Id: I31e17d164326233c06d61a780fdcd26d7d73e833