Merge "Add equal overloads to some MediaDescription and MediaQueue objects (2/3)" into oc-mr1-dev
am: 619503b279

Change-Id: Id148586a545c653dc57768533da9a066c1e7a662