Merge "Match src paths with aidl package name" into qt-dev-plus-aosp