Merge "Add NDK Choreographer API headers"
am: 78e7eb7

* commit '78e7eb71527dffd0d3fde4ee8109de812c79586a':
  Add NDK Choreographer API headers

Change-Id: Icbffe174f0ed07f049ae844816ff25ae556bcb07