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

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

Change-Id: Id1e0cbdfbe6220e955b39975ccbb7d039e0f5a83