am 161b3624: Merge "Fix NullpointerException in MediaMetadataRetriever"

* commit '161b3624c2243cc5267287ebb5107cecffc918d1':
  Fix NullpointerException in MediaMetadataRetriever