am bb6d1fac: resolved conflicts for 85dc1577 to stage-aosp-master

* commit 'bb6d1facef2d04798dc10ad5146bb4383e5259ca':
  Enable signed-integer-overflow in foundation