[automerger skipped] Merge "Match src paths with aidl package name" am: 1224227e19
am: c070242550 -s ours
am skip reason: change_id I5fb25124a26f190c462e2e60fc75a88d48643c10 with SHA1 faeab0faa7 is in history

Change-Id: I9acf627ac87dfd33cca515adac3321c973064171