Revert "Fix media XML formatting"

This reverts commit d4eb0a728fa2a4bf19c1be7d130b158a7c30bc92.

Change-Id: I83d29972e537b9fd98fb3625a62f5dcbdf071e72