am 8335d8b2: am a4d929e3: Merge "Add -no-integrated-as at local level."

* commit '8335d8b2ef4d22dcaccda9726c3a1460be2bd86c':