Merge commit 'ede799cc5b04f9eec252a598fdb6b1a8a2cbc3f3' of sso://googleplex-android/platform/system/tools/aidl into HEAD
Change-Id: If168c69614c32fd7fe2f7357dd7dc218b2436212
Ignore-AOSP-First: Internal projects only