Merge "Fix C compatibility in AMidi.h." into tm-dev-plus-aosp am: d34388f8...

Merge "Fix C compatibility in AMidi.h." into tm-dev-plus-aosp am: d34388f8 am: 40e392c2 am: c190af8a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19441167



Change-Id: Iae7282dd4e89de387c45adff883bc092d0229148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>