Merge \\\\"Fix typo in setting PRIVATE_MODULE for AIDL source\\\\" am: 05038d84dc am: 2ee4f68d38 am: 28db78a499
am: ef2a8bc195

Change-Id: I0f0932e507a4ab57eb6e7e9ee26fe756d7c64c31