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

* commit '3d41fc67c0f44c055cd6d1fc1063bb8ef46205e8':

Change-Id: I489dd5ca7e54466c596f154135e2aa228da354c0