Merge "Merge "Match src paths with aidl package name" am: fe283df7ab am: 705e339d6b am: d6efcba587" into qt-r1-dev-plus-aosp
am: 058da7ffb2

Change-Id: If73f4aa6947936cf7896b0618d30145dbcc5020e