More test code cleanup

This is a follow-up of I96b80a4a6aef903857478d3c2a54c69cbb997f77.

Bug: 150164755
Test: atest aidl_integration_test
Change-Id: I1e198fb80d88159c1f28346627aa527b705dfd60
2 files changed