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

Change-Id: I1b7046126abe4ef1cf6d9dcd83b0ac95cb20a2d7