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

Change-Id: Id20c5ad7eaaac4d23ee35999e8dd88fb89430876