add linaro fixes to bionic

Change-Id: I3156e2c5f699daa26b30a68b4b860e27a0e3f65c