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

Change-Id: Ie6a21267346bbd65803c1e12caee4256399e79c3