am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb

* commit 'f10d940413000732f1cd35bcb113c41019c7e3b7':
  StagefrightMediaScanner: Close metadata retriever after we are done scanning