Merge "Remove ExternalMediaFormatActivity" into mnc-dev