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: df493d23

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



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