Merge "Fix free-after-use for MediaHTTP" into nyc-dev am: d0b2fa5f3d
am: f72d7fb18e

Change-Id: I073be1a5169a2ed6a005b883f96c715d2feb5a22