Break long lines in media related classes

Change-Id: I94653b4cde14f75180dae795d1fdaa1b073ec1d1
Merge "Break long lines in media related classes"