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

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