Merge "Fix typo in setting PRIVATE_MODULE for AIDL source"