Merge "Change AIDL module name"
am: 450a38b074

Change-Id: I28c008c15686477010d5d2bbfc46de1b2509ebcf