Merge commit '4feb59e7a769fb7c453a6009907c474a0914adc5' of sso://googleplex-android/platform/system/tools/aidl into HEAD
Change-Id: Ibc45a960ebf050e0694fcc3a8e20d2e786ad69bc