Merge \"Fix memory leak in MediaScannerConnection\"
am: e40ab18590

Change-Id: I894584a5d193624acc78c20a6207b54b20b61563