Merge "Reworked GenerateDaggerApplication."
am: c49c914e53

Change-Id: If2e7550e9225b6d3d6e423a011ac35e91d47087d