am 77802977: am 161b3624: Merge "Fix NullpointerException in MediaMetadataRetriever"

* commit '778029776bac60856af7e97e19deb7b1f42b1984':
  Fix NullpointerException in MediaMetadataRetriever