Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768a3f03
am: 6705aadd4b

Change-Id: Idadacc9024cb424c771f546b4a9bdec6fff7c6b4