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

Change-Id: I9360a01c8a10eac5523f7307366d232e711ae23d