am 7f20405f: am 8389210d: Merge "Add -no-integrated-as at local level."

* commit '7f20405f97ba52e97e365ff61fe8778b09472080':