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

Change-Id: I73ec3365c21238f7ca328763df52121b43911e04