am ad0ff1d9: am 4fceda2b: Merge "Add -no-integrated-as at local level."

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