Merge "Move CancellationSignal to android.os package." into jb-dev