Merge "Match src paths with aidl package name" am: 9af3b16c72
am: b12b3393f8

Change-Id: Ieadc77e50956af0cf2dfbbb4148a75f03a18927e