Merge changes from topic "omx-dtd"

* changes:
  Move media configuration to its own directory.
  Add Android.mk back for media profile.