am acfe8bb3: am 7fb54bb1: Merge "Add -no-integrated-as at local level."

* commit 'acfe8bb381dd96f2a1cfe44c882ecd06fbce27f1':