Merge "Allow module libs to use VINTF AIDL (part II)"