Merge "Change AIDL module name" am: 450a38b074
am: 432fb0358b

Change-Id: Ib67d2e7f95592b2b94b43001f89a9413ff01dfcd