Merge "Support LOCAL_ADDITIONAL_DEPENDENCIES for java"