Merge "Merge "Inject dependencies instead of fetching them" into qt-dev am: 6c88570f25 am: dd7b6f93f2" into qt-r1-dev-plus-aosp
am: b5a5ff7bba

Change-Id: I28ee5f93ddeeed9fe3cf1f1a5f5c9f382750d54c