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

Change-Id: I5714252c0373db0fc85bf65df7b52c983fbc6171