Merge "Fix memory leak in MediaScannerConnection am: 439e5e49fb am: 6e02888c94" into nyc-mr1-dev-plus-aosp