Merge "Add NDK Choreographer API headers" am: 78e7eb7
am: 920838f  -s ours

* commit '920838f53eb73e0133b07098633357f7a2c2bad6':
  Add NDK Choreographer API headers

Change-Id: Ic7bb76555186306c43e593a585f066bf3b72c6c7