Merge "Match src paths with aidl package name"
am: fe283df7ab

Change-Id: I0f3063be39a47f7cab34241632b7694c178adb33