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

* commit '53150eb4fb5c3bbcb0138b8dccb481726299f6ab':
  Fix a bug in combination of intrinsics and kNoOutputOverlap.