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

Change-Id: I579b6cfb6edec74da4149f1cf9cee9a061802ff8