am e9cc4c3a: (-s ours) am d436030f: am b55897a7: Merge "Use unified syntax to compile with both llvm and gas."

* commit 'e9cc4c3a0ac91af05bdb7b6bcc850e55b9e258f0':