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

Change-Id: Id85523087b8c059262d1146d10fbc95cf12da2cf