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 am: 561d48e981
am: 2f8563e9af

Change-Id: I8736ee8352e75f6e7d77e9009c359b2f2d50c761