Merge "Match src paths with aidl package name" into qt-dev-plus-aosp am: 5c0613472f
am: 61f8421024

Change-Id: I2da2cfddb9812b12da1199e158688d98041e774a