Merge "Port java.mk desugar changes to host_dalvik_java_library.mk"
am: 12e17ca46c

Change-Id: I31bec1f575b0fcf9d4875f381a1f982abc2d9d7b