Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals" am: a4b31e5eda am: 0ff957d67f
am: 3ef79ecd1d

Change-Id: I31303b4da0797efab9d90402261dd801d6deca5e