Merge "Match src paths with aidl package name"
am: 1f1d0260a0

Change-Id: I994762e4fd40d4575fa69d98bfbe14f1d9233254