Merge changes Ia9c7dd04,I6aa1263d

* changes:
  MediaCompat: Backport repeat and shuffle support in API < 21
  MediaCompat: Backport repeat and shuffle support in API25+