Merge "patchoat: take directories instead of filenames"
am: 535d381b8b

Change-Id: Iebeb66ba20ed0a64f5a3b3792421ed1ca429da61