Merge "Add CTS tests for Media 2.0 APIs"