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: ef18d4c57b

Change-Id: Ie3b32210f90b6a294776c40da4d6cf9f24828c06