Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev am: 9061b26f1e am: 12273862c3
am: d1991f03de

* commit 'd1991f03de6e2fa25f7e3f6d8cc5a6b25ce6ff7e':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: Icbd327f57fbadacadf70c47f8c60dcfb6bdeeaef