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

Change-Id: Ib2773de7e003ab14d18e5b8c8f70e4800e0cfc63