Match src paths with aidl package name
am: 3c7e4b6046

Change-Id: Ibe321a80917daf2e0ba77af91ea2a430437c0004