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

Change-Id: I449ea5f4c138a0ddbf1243688bd3b1de7ddf052f