Avoid parameter annotation overwriting into dex comparator

Change-Id: Id67aa40962219f34c3643254550592c1ee7576a1
Avoid ZipException when zip output has no entry

Bug: 17520346
Change-Id: I559210eefe5601147c59f742a3b307314de121d4
Merge "Avoid ZipException when zip output has no entry" into ub-jack
Merge "Avoid parameter annotation overwriting into dex comparator" into ub-jack