Merge "Fix fragile assumptions about build toolchain. (attempt #2)" am: 48ee187e98
am: b9511c87b6

Change-Id: I1901b37b8cd42e571f17bb986f64a3979290b1c6