Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev am: 9061b26f1e am: 3d41fc67c0
am: 2d22b6709d

* commit '2d22b6709de5c0a339774ae3ad8a37bb1b4bdbde':

Change-Id: Ia1877a3eb504945a1d10d5432460f59c6463c618