Merge "Match src paths with aidl package name"