Merge "Re-enable media platinum tests after tradefed fix"