am bf888177: am a4e9d09e: resolved conflicts for merge of 520d9ab3 to stage-aosp-master

* commit 'bf88817708af863683bc0d48dad991a4985d6c33':
  Enable fsanitize unsigned-integer-overflow in webm