Merge "Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it's not needed."