[automerger skipped] Merge "glob pattern is used for AIDL files under...
[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp-master
am: 665258fc -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 f20f181c is in history
Change-Id: I2b7a81f27987040d1cc292130a87f60ec2129ffc