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

Change-Id: Ia87f8efe6dfeb43663325ea984a0a2cd83885d41