Merge "Match src paths with aidl package name" am: 94f300295d
am: 4be1fb5196

Change-Id: I19f23733b9114fe661b2e59b792cb9b1a2490465