update-makefiles for transisitive dependencies

Test: pass
Bug: 36162559
Change-Id: I4f5fddaef9811f0da1d69fa26a5d34830a1a9634
4 files changed