Bug 979716: fix mistake in Aurora uplift merge for AEC setting r=slee a=lmandel
Uplifting under existing a= since it we uplifted the wrong (old) patch