Merge "Add unit tests for AidlConversionNdk" am: d02dde2d am: aac1223a am:...

Merge "Add unit tests for AidlConversionNdk" am: d02dde2d am: aac1223a am: b2efd34c am: 6eb0e96a am: 5256d5fe

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2480859



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