Update formatting for media related classes

Change-Id: Iaa81af5b65a650222fa65bf8c368e4f1ec3ce9c0
Remove PHP4 style constructor

Change-Id: Ic0eaac33286deef3e1ea8078ebc25cfc1cecf422
Merge changes Ic0eaac33,Iaa81af5b

* changes:
  Remove PHP4 style constructor
  Update formatting for media related classes