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

Change-Id: Ic5bfe1fe773250aa943cffb4cdf6f7b14478c64c