Merge "Use base module names for ALL_AIDL_INTERFACES" into rvc-dev am: 69cd646e30

Change-Id: Ib0a71f8ee3da2c872956cc0060f67ff84eec72cd