Fix sc-dev-plus-aosp builds am: 823f787a31 am: 07a72126b1

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

Change-Id: I9a4dd27f8672343900a5b0c6b235a34096c76869