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

Change-Id: I03a10450ed6f721942dca24a491b2efffcf9d830