[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base"
am: bd8e232e20 -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 0c6dc7b709 is in history

Change-Id: Ib8f2525133a03860bea23924dcd7b7fd6bf55f4b