am 24f62a54: am d37bf4e9: am f93c7c70: am 041d4470: am 695d8f69: Merge "Add -Wl,-maarch64linux"

* commit '24f62a54e16a2310d25796c9a3a7cfb5114e5c90':