Merge "Port java.mk desugar changes to host_dalvik_java_library.mk"