Merge "Use pathlib Path.glob instead of glob.glob(recursive=True)"
am: d858301a91

Change-Id: I39bf987e10fed299dac3eb58f25341c7bcfb460f