Bug 915870. Cleaner if statement. r=aki
Bug 922145 - Ignore geckoview files when parsing the make upload output. r=aki