am 80bfc59f: am 53150eb4: Merge "Fix a bug in combination of intrinsics and kNoOutputOverlap."

* commit '80bfc59f04d0f5998554fbe321fdb8bc4ed79536':
  Fix a bug in combination of intrinsics and kNoOutputOverlap.