Merge changes from topic "sdkz"

* changes:
  Build MediaProviderLegacy with "system_current".
  Another push towards "system_current".