Merge "More LOCAL_ADDITIONAL_DEPENDENCIES."