am 69ec3afd: Merge "Move CancellationSignal to android.os package." into jb-dev

* commit '69ec3afd0844994a8dd739279a55143e6437ae54':
  Move CancellationSignal to android.os package.