Revert "Fix amp-image won't render after resize in amp-fx-flying-carp…

…et with media attribute (#16809)"

This reverts commit a08806c.

extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js

@@ -90,12 +90,11 @@ export class AmpFlyingCarpet extends AMP.BaseElement {
   }
 
   /** @override */
-  onMeasureChanged() {
+  onLayoutMeasure() {
     const width = this.getLayoutWidth();
-    this.mutateElement(() => {
+    this.getVsync().mutate(() => {
       setStyle(this.container_, 'width', width, 'px');
     });
-    this.scheduleLayout(dev().assertElement(this.container_));
   }
 
   /** @override */

extensions/amp-fx-flying-carpet/0.1/test/test-amp-fx-flying-carpet.js

@@ -132,16 +132,16 @@ describes.realWin('amp-fx-flying-carpet', {
       const container = flyingCarpet.firstChild.firstChild;
       let width = 10;
 
-      impl.mutateElement = function(callback) {
+      impl.getVsync().mutate = function(callback) {
         callback();
       };
       impl.getLayoutWidth = () => width;
 
-      impl.onMeasureChanged();
+      impl.onLayoutMeasure();
       expect(container.style.width).to.equal(width + 'px');
 
       width++;
-      impl.onMeasureChanged();
+      impl.onLayoutMeasure();
       expect(container.style.width).to.equal(width + 'px');
     });
   });
@@ -206,20 +206,4 @@ describes.realWin('amp-fx-flying-carpet', {
       expect(attemptCollapse).to.have.been.called;
     });
   });
-
-  it('should relayout the content on onMeasureChanged', () => {
-    return getAmpFlyingCarpet().then(flyingCarpet => {
-      const impl = flyingCarpet.implementation_;
-      const container = flyingCarpet.firstChild.firstChild;
-      const scheduleLayoutSpy_ = sandbox.spy(impl, 'scheduleLayout');
-
-      impl.mutateElement = function(callback) {
-        callback();
-      };
-
-      impl.onMeasureChanged();
-      expect(scheduleLayoutSpy_).to.have.been.calledWith(container);
-    });
-  });
-
 });