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

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