am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES."

* commit '7f2bc6c73b9f21515235fb638a0f510af3c45b44':
  More LOCAL_ADDITIONAL_DEPENDENCIES.