Remove use of macro to pull in dependencies
am: 9702247825

Change-Id: I6de5b16c48a941b812551909cd1395a39f092eb0