Changed to use the builder from media-api

Change-Id: Id56ab589f14f435a60672b68e8ad54ee288e3c58