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

* commit '8389210d541da26b553439ea3efecfd50f9b2310':
  Add -no-integrated-as at local level.