Minimal fix for merging jars with dir entries am: b7120f2b23
am: 752450080f

Change-Id: Ia7d1fdb5766262b53a6d47193d2f73d6d1a7613a