Merge "Match src paths with aidl package name"
am: 9af3b16c72

Change-Id: I4dee345441d29f050d325cf23e67a5d254c25e31