Merge "Rescan files from sdcard when removing nomedia" am: 9eb770968b am: 765301048d
am: 0a59e7725b

Change-Id: I86c4d35e2d3da72b64dfc57f314cec7c8913468c