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

Change-Id: I2f87f686a2083c12faa087b4601ff81f5936cea7