Merge "Fix memory leak in MediaScannerConnection" into nyc-mr1-dev am: 1f65a69d9a am: 5e8f350e01
am: 15153f8d3e

Change-Id: I5a44d966fdb9a736f104881ec8c105d9c0ede693