[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp-master am: 665258fc50 -s ours
am: 625e0eef9f -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 f20f181c53 is in history

Change-Id: Ibca2e86640f2f351bf14ee592372bb6a50b0189e