Merge "AIDL vts non reader writer 2.1 tests"