More test code cleanup am: 0f06528586

Original change: https://android-review.googlesource.com/c/platform/system/tools/aidl/+/1373158

Change-Id: I2e8df7aecaf0ff7a966c009272a48d8ee4f6f347