Merge "Stagefright: remove binder dependency on IMediaHTTP*"