Merge "Match src paths with aidl package name" into qt-dev-plus-aosp
am: 5c0613472f

Change-Id: I401901d7ce17c083af2a99a96c5a867682a6ff27