am cc503471: resolved conflicts for 619e79a2 to stage-aosp-master

* commit 'cc503471b9ca78d86ad8a53cb271361276190fee':
  Enable signed-integer-overflow in wifi-display