Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals" am: a4982eb5dd
am: aa92f80288

Change-Id: I73efdce859b040eb7e74fa50a96102b5b8a2c3f7