Merge "glob pattern is used for AIDL files under frameworks/base" into qt-dev-plus-aosp