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

Change-Id: Ie28b57bd8ed157a7a34a5224bf3f52d7818b6205