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

Change-Id: I4ee3fc1b2ca71fe42d9d1001b371f6daf7f17f53