Merge "Revert "Allow ESP call MediaStore's update() to move/rename a folder.""