Merge "Add gfxinfo log collector to AUPT"