Merge "[automerger skipped] Merge "Allow module libs to use VINTF AIDL (part II)" am: 1054fd8e86 am: 3719bd9cd0 -s ours am: f73a22aa44 -s ours am: 1b2341bded -s ours am: 9736e62fd0 -s ours"