Fix memory leak in MediaScannerConnection am: 439e5e49fb am: 6e02888c94
am: 5a5326a562

Change-Id: I1ec4d35ced85be7519c3b549b0c0a4e22f96e48d