Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768a3f03 am: 6705aadd4b am: 04cb1d7f53 am: 57f4543970
am: 4363301afe

Change-Id: Ie5f76651551906523c6413ae53ec3f002f108e1b