am f00666b9: am e9fa23fe: resolved conflicts for 1f8749f2 to stage-aosp-master

* commit 'f00666b9a52f0bd18b2a2cae006cb4fb91b2103d':
  Enable integer overflow detection in libmedia
  Fix benign overflow in ClientProxy::getMisalignment
  Fix benign unsigned overflow in AudioTrack