Merge "Add tests for AIDL union"