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

Change-Id: I54c7ed245302f0ed71c2ea57051892af74502ee0