Merge "Adding a configure flag to control WebM container support"