Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals"
am: a4b31e5eda

Change-Id: I3bcd5bd68911a33bc10178394518c6da9c3a6f7a