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

Change-Id: Idc7f2b393b0d181e8aae3a15a9c376bf0189823a