am 2d15fb26: am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."

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