am 2ddb9cb1: am ed43be39: Merge "Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it\'s not needed."

* commit '2ddb9cb106d13451cfd3d95fc8b4bc3619959900':
  Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it's not needed.