Merge "have patchoat take directories instead of filenames" am: a92749ebae
am: 6853290fcb

Change-Id: I0f607b38df2d1d478996638a715e2b5a82a34d42