DO NOT MERGE ANYWHERE Avoid accidentally using the host's native 'as' command. am: eea0ad4ca0  -s ours am: 15d96a6b74  -s ours am: 9aacce7aed  -s ours
am: decff97502  -s ours

Change-Id: I89f7db61a2720d54c07935512de57d589fdcb27a