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

Change-Id: I6cdfb83e10760e236a4c191cd5c6609f8b7efd8d