Minimal fix for merging jars with dir entries
am: b7120f2b23

Change-Id: I16f2a2a1a74851ebee0bde0dae25e4402e37e665