Merge "media: Fix a typo in parsing nclc atom." into nyc-dev