am 1957fd27: Merge "Add public API to Choreographer." into jb-dev

* commit '1957fd271f4e76c471d483df98cf23abf3e92360':
  Add public API to Choreographer.