Merge "Match src paths with aidl package name" into qt-dev-plus-aosp am: 3f18d11e92
am: 8cdb3bab63

Change-Id: Id36340d2343353deef93a76bd3b055f38125c94f