Minimal fix for merging jars with dir entries am: b7120f2b23 am: 752450080f am: f1f3f02131 Change-Id: Ic9fbe1fed744031b97f6826c2750524c6e787bf6