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
am: 5f4d2ea06e

Change-Id: Ia1ea2ea08da0f14d1d809b1b6aa952dc9168af6f