Bug 964820 - Re-enable test_cards_view_kill_apps_with_two_apps on device
Bug 957497 - Allow include of uncompressed data files in the package apps

Conflicts:
	build/utils-xpc.js
	build/utils.js
Bug 938080 - set 'xyz'.suspended to false if user toggle 'xyz'.enabled on manually
Bug 952691 - [B2G][Contacts][Facebook Sync]Contacts imported from Facebook do not sync every 24 hours to reflect profile changes.
Merge pull request #15961 from yurenju/uncompress-2

Bug 957497 - Allow include of uncompressed data files in the package apps r=@timdream
Bug 962976 - Use a blacklist to avoid compressing specific file types which are already compressed r=yurenju
Bug 962938 - Inconsistent file path in zip file
Merge pull request #14298 from dwi2/bug938080

Bug 938080 - set 'xyz'.suspended to false if user toggle 'xyz'.enabled on manually r=crh0716
Merge pull request #16024 from jmcanterafonseca/fb_sync_fixed

Bug 952691 - [B2G][Contacts][Facebook Sync]Contacts imported from Facebo...
Merge pull request #15938 from AndreiH/bug964820

Bug 964820 - Re-enable test_cards_view_kill_apps_with_two_apps on device