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

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