More LOCAL_ADDITIONAL_DEPENDENCIES.

Change-Id: I9bf20507442b0722e93446fdb32d8236be974e28
Merge "More LOCAL_ADDITIONAL_DEPENDENCIES."