Merge "media: update AMessage to use handler instead of handler-id"