Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b
am: d6768a3f03

Change-Id: Iafba587d46764fb47a425d602172cb1c82636d52