Re-land "Bug 961047 - Remove some dead code in Gaia with APZC enabled by default from the platform. r=alive,fabrice"

This reverts commit cd0647684b057a9a8d02b362fa72fa41aa70bacf.