Merge "Add unit tests for AidlConversionNdk"