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

Change-Id: I95be785b4f5f93b49125b4ae68547f1f26d82d1d