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

Change-Id: Ie36864832ac1364b6a2affa547ec71d7b04d583d