Merge "Add missing include to choreographer header."
am: e2e44dd

* commit 'e2e44ddc6b0830d03f55e1388c96ef66d1d00ed2':
  Add missing include to choreographer header.

Change-Id: I4a1c74e32a587f063ee921dc6fa82cfe7dea6e83