Merge "Delete the removed define MEDIA_STORAGE_TYPE" into tizen