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

Change-Id: I7e31caa95ecafa05a153b90bafe9c89bed72fd46