Merge "Match src paths with aidl package name" am: fe283df7ab
am: 705e339d6b

Change-Id: I5145212534289111205d913d9a66b3208e9f3272