Merge "Match src paths with aidl package name"
am: 8b9a14e7fc

Change-Id: I79f8ab3bb992c1ddde4c3022e4af3cd132204e8a