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

Change-Id: I9694372c4447190efdc2dd3d07e240a045179ba2