Add Fennec ADI to the output per METRICS-1419

Add mobile ADI to the export, and update name of desktop ADI so that
the exported json files are clearly named.  This also completes
METRICS-1418.