Merge "Match src paths with aidl package name"
am: 1224227e19

Change-Id: I8b2dd77e59c8e54e8f894670ee91e41db5a85f31