Merge "Match src paths with aidl package name" into qt-dev-plus-aosp am: 04d70c0d4b
am: 284842e915

Change-Id: Iea6615e165e91c93347cce0c8cee0268615f91b9