Merge "Avoid accidentally using the host's native 'as' command." into cw-f-dev
am: 4e07040287

Change-Id: I6e71f55a7d3d7c51d3d50994f6588ab789aa553b