Merge "VTS: enforce AIDL for media.c2" into main