am ec99f609: Merge "Rename CancellationSignal using preferred spelling."

* commit 'ec99f609cc2db862db307f7ba56a2400c58403a0':
  Rename CancellationSignal using preferred spelling.