[automerger skipped] Merge "Match src paths with aidl package name" am: 1f1d0260a0
am: 9dcf3bc9a5 -s ours
am skip reason: change_id I33c684de4c0c52012b496d2f2447eceaba26c191 with SHA1 a5d6522ff0 is in history

Change-Id: I63298fd2dc1b7bb521ffc5e75fdf1c76c5d197fd