Add dependencies on included makefiles.

Bug: 11050594

Merge from internal master.

(cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6)

Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2 files changed