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

Change-Id: I92bfb4e280eacc571399a2ee32e416b42af023f3